Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove unneeded fn main blocks from docs #64912

Merged
merged 1 commit into from
Oct 2, 2019
Merged

Remove unneeded fn main blocks from docs #64912

merged 1 commit into from
Oct 2, 2019
+266 −372

Conversation

tesuji
Copy link
Contributor

@tesuji tesuji commented Sep 30, 2019 •
edited
Loading

@rust-highfive
Copy link
Collaborator

r? @joshtriplett

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 30, 2019
@tesuji
Copy link
Contributor Author

tesuji commented Oct 1, 2019

r? @jonas-schievink

jonas-schievink
jonas-schievink reviewed Oct 1, 2019
View reviewed changes
Copy link
Contributor

@jonas-schievink jonas-schievink left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

src/liballoc/sync.rs Outdated Show resolved Hide resolved
@tesuji tesuji force-pushed the unneeded-main-doc branch from 375ce0d to 6c1b447 Compare October 1, 2019 11:55
@jonas-schievink
Copy link
Contributor

Thanks!

@bors r+

@bors
Copy link
Contributor

bors commented Oct 1, 2019

📌 Commit 6c1b447 has been approved by jonas-schievink

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 1, 2019
Centril added a commit to Centril/rust that referenced this pull request Oct 1, 2019
@Centril
Rollup merge of rust-lang#64912 - lzutao:unneeded-main-doc, r=jonas-s…
b69acfa 
…chievink

Remove unneeded `fn main` blocks from docs

## [No whitespace diff](https://github.com/rust-lang/rust/pull/64912/files?w=1)
@Centril Centril mentioned this pull request Oct 1, 2019
Closed
bors added a commit that referenced this pull request Oct 1, 2019
@bors
Auto merge of #64958 - Centril:rollup-8k5m97o, r=Centril
8d0ebb2 
Rollup of 5 pull requests

Successful merges:

 - #63416 (apfloat: improve doc comments)
 - #64404 (Add long error explanation for E0495)
 - #64910 (syntax: cleanup param, method, and misc parsing)
 - #64912 (Remove unneeded `fn main` blocks from docs)
 - #64952 (Update cargo.)

Failed merges:

r? @ghost
tmandry added a commit to tmandry/rust that referenced this pull request Oct 1, 2019
@tmandry
Rollup merge of rust-lang#64912 - lzutao:unneeded-main-doc, r=jonas-s…
3ab24e6 
…chievink

Remove unneeded `fn main` blocks from docs

## [No whitespace diff](https://github.com/rust-lang/rust/pull/64912/files?w=1)
@tmandry tmandry mentioned this pull request Oct 1, 2019
Closed
tmandry added a commit to tmandry/rust that referenced this pull request Oct 1, 2019
@tmandry
Rollup merge of rust-lang#64912 - lzutao:unneeded-main-doc, r=jonas-s…
4492cd3 
…chievink

Remove unneeded `fn main` blocks from docs

## [No whitespace diff](https://github.com/rust-lang/rust/pull/64912/files?w=1)
@tmandry tmandry mentioned this pull request Oct 1, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Oct 1, 2019
@Centril
Rollup merge of rust-lang#64912 - lzutao:unneeded-main-doc, r=jonas-s…
25ee410 
…chievink

Remove unneeded `fn main` blocks from docs

## [No whitespace diff](https://github.com/rust-lang/rust/pull/64912/files?w=1)
@Centril Centril mentioned this pull request Oct 1, 2019
Closed
Centril added a commit to Centril/rust that referenced this pull request Oct 1, 2019
@Centril
Rollup merge of rust-lang#64912 - lzutao:unneeded-main-doc, r=jonas-s…
7628cad 
…chievink

Remove unneeded `fn main` blocks from docs

## [No whitespace diff](https://github.com/rust-lang/rust/pull/64912/files?w=1)
@Centril Centril mentioned this pull request Oct 1, 2019
Merged
bors added a commit that referenced this pull request Oct 1, 2019
@bors
Auto merge of #64972 - Centril:rollup-gcawast, r=Centril
7130fc5 
Rollup of 7 pull requests

Successful merges:

 - #63416 (apfloat: improve doc comments)
 - #64820 (BTreeSet intersection, is_subset & difference optimizations)
 - #64910 (syntax: cleanup param, method, and misc parsing)
 - #64912 (Remove unneeded `fn main` blocks from docs)
 - #64933 (Fixes #64919. Suggest fix based on operator precendence.)
 - #64943 (Add lower bound doctests for `saturating_{add,sub}` signed ints)
 - #64950 (Simplify interners)

Failed merges:

r? @ghost
@bors bors merged commit 6c1b447 into rust-lang:master Oct 2, 2019
@tesuji tesuji deleted the unneeded-main-doc branch October 2, 2019 02:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonas-schievink jonas-schievink jonas-schievink left review comments

Assignees

@jonas-schievink jonas-schievink

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tesuji @rust-highfive @jonas-schievink @bors @joshtriplett